syncing up with normal makefiles

diff --git a/ChangeLog b/ChangeLog
index 6eb4920605573ea20e03ff44bc4f16b7db19ec58..5e41083ec99ffebf519961ee576204e0da0e2f9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-15  Øyvind Kolås  <pippin@gimp.org>
+
+       * Makefile-mini: compile both the nop and introspect programs by
+       default.
+       * babl/Makefile-mini: link with standard math library
+
 2005-08-14  Øyvind Kolås  <pippin@gimp.org>
        
        * tests/float_to_u8.c

diff --git a/Makefile-mini b/Makefile-mini
index 72b3abfd822eddf7da2e90cbd5e7443cb91ea958..d54c43824c77a02937f6802f49837e6a1a4a321b 100644 (file)
--- a/Makefile-mini
+++ b/Makefile-mini
@@ -2,7 +2,7 @@
 # introspection/sanity tests, will not build an actual library
 
 all:
-       make -f Makefile-mini -C babl ../tests/nop
+       make -f Makefile-mini -C babl
        tests/nop
 introspect:
        make -f Makefile-mini -C babl ../tests/introspect

diff --git a/babl/Makefile-mini b/babl/Makefile-mini
index ea1d7fb6dc4a62d16aada98509597ab59ade5b8a..aad334d61f90976ef638229c7af636f4e9438b73 100644 (file)
--- a/babl/Makefile-mini
+++ b/babl/Makefile-mini
@@ -8,7 +8,8 @@ TARGETS =                               \
 
 default: $(TARGETS)
 
-CFLAGS = -Wall -Werror -g -O1 -I./babl-base  -I. -I..
+CFLAGS = -Wall -Werror -g -O0 -I./babl-base  -I. -I..
+LDADD  = -lm
 
 BABL_OBJECTS=                                  \
        babl.o                                  \
@@ -36,10 +37,10 @@ BABL_OBJECTS=                                       \
 
 
 ../tests/nop: ../tests/nop.c $(BABL_OBJECTS)
-       gcc -o $@ $< $(BABL_OBJECTS) -I../babl/
+       gcc -o $@ $< $(BABL_OBJECTS) -I../babl/ $(LDADD)
 
 ../tests/introspect: ../tests/introspect.c $(BABL_OBJECTS)
-       gcc -o $@ $< $(BABL_OBJECTS) -I../babl/
+       gcc -o $@ $< $(BABL_OBJECTS) -I../babl/ $(LDADD)
 
 clean:
        rm -f $(TARGETS) $(BABL_OBJECTS) ../*~ ../*/*~ ../*/*~